-
Notifications
You must be signed in to change notification settings - Fork 3.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rac2: return tracked deductions on close/removal #130684
Conversation
905173c
to
b24d692
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @kvoli)
pkg/kv/kvserver/kvflowcontrol/rac2/range_controller.go
line 780 at r1 (raw file):
}() { case replicate, probeRecentlyReplicate: rs.closeSendStream(ctx)
This change is already doing part of the cleanup from #130168 which eliminated snapshot
connectedState
. May as well do this now, instead of leaving cruft like changeToStateSnapshot{Locked}
around.
b24d692
to
de91244
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TYFTR!
Reviewable status: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @kvoli and @sumeerbhola)
pkg/kv/kvserver/kvflowcontrol/rac2/range_controller.go
line 780 at r1 (raw file):
Previously, sumeerbhola wrote…
This change is already doing part of the cleanup from #130168 which eliminated
snapshot
connectedState
. May as well do this now, instead of leaving cruft likechangeToStateSnapshot{Locked}
around.
Yeah good idea, did the snapshot cleanup and delayed stream init now.
de91244
to
b62c94b
Compare
When a replica was removed from a range, or the range controller closed, any tracked deductions did not return tokens to the respective stream token counts. Update `CloseRaftMuLocked` and `SetReplicasRaftMuLocked` to close any replica send streams for replicas which are no longer part of the replica set, closing all when the range controller closes. Also immediately close the send stream when a replica transitions to StateSnapshot. Resolves: cockroachdb#130683 Release note: None
b62c94b
to
0cab9b5
Compare
rm'd this function and pushed an amended the commit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 3 files at r1, 4 of 4 files at r2, all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @kvoli)
TYFTR! bors r=sumeerbhola |
When a replica was removed from a range, or the range controller closed, any tracked deductions did not return tokens to the respective stream token counts.
Update
CloseRaftMuLocked
andSetReplicasRaftMuLocked
to close any replica send streams for replicas which are no longer part of the replica set, closing all when the range controller closes.Also immediately close the send stream when a replica transitions to StateSnapshot.
Resolves: #130683
Release note: None